#4549 kotlin ijar test cases #4632

hsyed · 2018-02-13T16:37:49Z

Inlining test cases for #4549. The jar also contains the metadata file which needs to be retained META-INF/inline-cases.kotlin_module

bazel-io · 2018-02-13T16:37:51Z

Can one of the admins verify this patch?

philwo

Thanks!

@cushon Could you give this a look as well?

philwo · 2018-02-15T15:44:20Z

third_party/ijar/test/ijar_test.sh

+    mkdir -p $3 || fail "could not ensure output dir"
+    ${IJAR} $1 $2 || fail "ijar failed"
+    pushd $3
+        ${JAR} xf $2 || fail "could not extract jar contents"


Please just indent with 4 spaces here, too.

It's showing up as 4 spaces on my side (not a tab).

philwo · 2018-02-15T15:44:41Z

third_party/ijar/test/kotlin/InlineCases.kt

+    inline fun inheritedInlineFun(op: () -> Unit) { op() }
+}
+
+object ObjectInheritingInline: AbstractClassWithInline()


Please add newline at the end of the file.

philwo · 2018-02-15T15:44:45Z

third_party/ijar/test/kotlin/regen.sh

@@ -0,0 +1,3 @@
+#!/bin/bash -eu
+
+kotlinc -module-name inline-cases -d inline-cases.jar InlineCases.kt


Please add newline at the end of the file.

updated so the test correctly fails.

laszlocsomor · 2018-03-09T12:30:16Z

@hsyed : Do you have any updates? Do you still want to merge this PR?

laszlocsomor · 2018-03-09T12:31:29Z

@philwo , could you please take another look?

philwo

Don't know much about Kotlin nor ijar, but this seems like a good addition to the test suite to me.

laszlocsomor · 2018-03-09T12:50:09Z

Thanks @philwo for the update! Do you want to import this?

philwo · 2018-03-09T13:00:28Z

@laszlocsomor Yes, I'll send you a CL. :)

hsyed · 2018-03-09T16:09:41Z

It is ready to merge

buchgr · 2018-03-21T18:56:28Z

@hsyed Sorry for the delay. Philipp needs to make some changes internally so that he can import this PR.

philwo · 2018-03-27T15:46:08Z

@hsyed I tried to import this PR, but the tests don't pass. I see the following errors. Can you help me figuring out what's wrong?

You can see the current version of the code that I tried to check in here: https://bazel-review.googlesource.com/c/bazel/+/44791 (please ignore any diffs in files except third_party/ijar/... - they are unfortunately generated by our importing script and are just a UI issue)

** test_kotlin_metadata_retention **********************************************
/var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/436426416158653421/execroot/io_bazel/_tmp/6509e9299f97f59c74a8df033517ef10/kotlin/inline /var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/436426416158653421/execroot/io_bazel/bazel-out/k8-fastbuild/bin/third_party/ijar/test/ijar_test.runfiles/io_bazel
/var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/436426416158653421/execroot/io_bazel/bazel-out/k8-fastbuild/bin/third_party/ijar/test/ijar_test.runfiles/io_bazel
-- Test log: -----------------------------------------------------------
------------------------------------------------------------------------
test_kotlin_metadata_retention FAILED: kotlin metadata not retained .
/var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/436426416158653421/execroot/io_bazel/bazel-out/k8-fastbuild/bin/third_party/ijar/test/ijar_test.runfiles/io_bazel/third_party/ijar/test/ijar_test:143: in call to test_kotlin_metadata_retention
FAILED: test_kotlin_metadata_retention

see https://storage.googleapis.com/bazel-buildkite-artifacts/f705022d-d8a8-41bc-8910-61ed9770b060/third_party/ijar/test/ijar_test/attempt_1.log

** test_kotlin_inline_retention ************************************************
/var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/7198431800070087349/execroot/io_bazel/_tmp/80b3b032c13a55d5f62efcda1a9bedd9/kotlin/inline /var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/7198431800070087349/execroot/io_bazel/bazel-out/k8-fastbuild/bin/third_party/ijar/test/ijar_test.runfiles/io_bazel
/var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/7198431800070087349/execroot/io_bazel/bazel-out/k8-fastbuild/bin/third_party/ijar/test/ijar_test.runfiles/io_bazel
-- Test log: -----------------------------------------------------------
public final class ClassWithInline {
  public final void classInlineFun(kotlin.jvm.functions.Function0<kotlin.Unit>);

  public ClassWithInline();
}
------------------------------------------------------------------------
test_kotlin_inline_retention FAILED: javap output missing expected substring:   public final void classInlineFun(kotlin.jvm.functions.Function0<kotlin.Unit>);
    Code: .
/var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/7198431800070087349/execroot/io_bazel/bazel-out/k8-fastbuild/bin/third_party/ijar/test/ijar_test.runfiles/io_bazel/third_party/ijar/test/ijar_test:137: in call to javap_decompile_and_assert_contains
/var/lib/buildkite-agent/.cache/bazel/_bazel_buildkite-agent/d4fe08e9d117c0a3a25bf2b3039e8671/bazel-sandbox/7198431800070087349/execroot/io_bazel/bazel-out/k8-fastbuild/bin/third_party/ijar/test/ijar_test.runfiles/io_bazel/third_party/ijar/test/ijar_test:148: in call to test_kotlin_inline_retention
FAILED: test_kotlin_inline_retention

see https://storage.googleapis.com/bazel-buildkite-artifacts/f705022d-d8a8-41bc-8910-61ed9770b060/third_party/ijar/test/ijar_test/attempt_4.log

philwo · 2018-04-14T06:03:15Z

@hsyed Friendly ping - I would love to get this merged.

hsyed · 2018-04-17T15:32:46Z

@philwo sorry for the day. The test cases are for #4549 they will fail till the ijar tool is updated.

irengrig · 2018-09-04T15:36:59Z

Hi All, Bazel sheriff is here. What is the status of this?

hsyed · 2018-09-04T18:16:01Z

This isn't in scope any longer. I'll close it.

googlebot added the cla: yes label Feb 13, 2018

hsyed mentioned this pull request Feb 13, 2018

kotlin_rules and Ijars: Update the Ijar tooling to do the right thing. #4549

Closed

philwo approved these changes Feb 15, 2018

View reviewed changes

hsyed added 4 commits February 15, 2018 21:26

bazelbuild#4549 kotlin ijar test cases

e651073

test logic, !!NOT FAILING!! ijar step is currently just doing a cp.

b0af820

Update ijar_test.sh

1f1b539

updated so the test correctly fails.

formating fixes

70d453c

hsyed force-pushed the kotlin-inline-ijar-cases branch from fe3044b to 70d453c Compare February 15, 2018 21:27

add missing inline modifier and regen

85a13fa

laszlocsomor assigned philwo Mar 5, 2018

philwo approved these changes Mar 9, 2018

View reviewed changes

hsyed closed this Sep 4, 2018

Bencodes mentioned this pull request Mar 10, 2022

Add toggle for ijar in java_import #14967

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#4549 kotlin ijar test cases #4632

#4549 kotlin ijar test cases #4632

hsyed commented Feb 13, 2018

bazel-io commented Feb 13, 2018

philwo left a comment

philwo Feb 15, 2018

hsyed Feb 15, 2018

philwo Feb 15, 2018

philwo Feb 15, 2018

laszlocsomor commented Mar 9, 2018

laszlocsomor commented Mar 9, 2018

philwo left a comment

laszlocsomor commented Mar 9, 2018

philwo commented Mar 9, 2018

hsyed commented Mar 9, 2018

buchgr commented Mar 21, 2018

philwo commented Mar 27, 2018

philwo commented Apr 14, 2018

hsyed commented Apr 17, 2018

irengrig commented Sep 4, 2018

hsyed commented Sep 4, 2018

		@@ -0,0 +1,3 @@
		#!/bin/bash -eu

		kotlinc -module-name inline-cases -d inline-cases.jar InlineCases.kt

#4549 kotlin ijar test cases #4632

#4549 kotlin ijar test cases #4632

Conversation

hsyed commented Feb 13, 2018

bazel-io commented Feb 13, 2018

philwo left a comment

Choose a reason for hiding this comment

philwo Feb 15, 2018

Choose a reason for hiding this comment

hsyed Feb 15, 2018

Choose a reason for hiding this comment

philwo Feb 15, 2018

Choose a reason for hiding this comment

philwo Feb 15, 2018

Choose a reason for hiding this comment

laszlocsomor commented Mar 9, 2018

laszlocsomor commented Mar 9, 2018

philwo left a comment

Choose a reason for hiding this comment

laszlocsomor commented Mar 9, 2018

philwo commented Mar 9, 2018

hsyed commented Mar 9, 2018

buchgr commented Mar 21, 2018

philwo commented Mar 27, 2018

philwo commented Apr 14, 2018

hsyed commented Apr 17, 2018

irengrig commented Sep 4, 2018

hsyed commented Sep 4, 2018